Merge branch 'upstream'
authorSamuel Mimram <smimram@debian.org>
Sun, 3 Feb 2008 19:49:32 +0000 (19:49 +0000)
committerSamuel Mimram <smimram@debian.org>
Sun, 3 Feb 2008 19:49:32 +0000 (19:49 +0000)
commit43f241c37b1b13e27ef26cf3d0cc5ad2f00bfb22
tree31a4e96541483b25eb09f5f686f756072d2a9931
parent92be219a2ce47e98b1e7fc1454ce2eebb19a8d2c
parentc54f22d62b761b26dd37d81b049a3d8bca5bf20c
Merge branch 'upstream'